From dd4361a63807bef13a5043b4acd5f19db7a3d984 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 6 Sep 2017 09:43:24 -0400
Subject: [PATCH] Rename enable-documentation and enable-man-pages options

You can now disable the documentation build with
-Ddocumentation=false and -Dman-pages=false.
---
 docs/reference/gtk/building.sgml | 8 ++++----
 docs/reference/gtk/meson.build   | 4 ++--
 meson.build                      | 4 ++--
 meson_options.txt                | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index 32ad404eee..f5a65fe12d 100644
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -305,13 +305,13 @@ How to compile GTK+ itself
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">-Denable-documentation=true</arg>
-            <arg choice="plain">-Denable-documentation=false</arg>
+            <arg choice="plain">-Ddocumentation=true</arg>
+            <arg choice="plain">-Ddocumentation=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">-Denable-man-pages=true</arg>
-            <arg choice="plain">-Denable-man-pages=false</arg>
+            <arg choice="plain">-Dman-pages=true</arg>
+            <arg choice="plain">-Dman-pages=false</arg>
           </group>
           <sbr/>
           <group>
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index 4371f01c52..f5437318d8 100644
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -47,11 +47,11 @@ gnome.gtkdoc('gtk4',
              install: true)
 
 xsltproc = find_program('xsltproc', required: false)
-if get_option('enable-man-pages') and not xsltproc.found()
+if get_option('man-pages') and not xsltproc.found()
   error('No xsltproc found, but man pages were explicitly enabled')
 endif
 
-if get_option('enable-man-pages') and xsltproc.found()
+if get_option('man-pages') and xsltproc.found()
   xlstproc_flags = [
     '--nonet',
     '--stringparam', 'man.output.quietly', '1',
diff --git a/meson.build b/meson.build
index 85f408cb7e..9c9abffac8 100644
--- a/meson.build
+++ b/meson.build
@@ -608,7 +608,7 @@ endif
 subdir('po')
 subdir('po-properties')
 
-if get_option('enable-documentation')
+if get_option('documentation')
   subdir('docs/tools')
   subdir('docs/reference')
 endif
@@ -621,7 +621,7 @@ summary = [
   '  Enabled backends: @0@'.format(pkg_targets.strip()),
   '  Vulkan support: @0@'.format(have_vulkan),
   '  Tests: @0@'.format(get_option('build-tests')),
-  '  Documentation: @0@'.format(get_option('enable-documentation')),
+  '  Documentation: @0@'.format(get_option('documentation')),
   '  Demos: @0@'.format(get_option('demos')),
   '------',
   ''
diff --git a/meson_options.txt b/meson_options.txt
index 0377d52b1d..643aa144da 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -30,9 +30,9 @@ option('disable-modules', type: 'boolean', value : 'false',
   description : 'Disable dynamic module loading')
 option('with-included-immodules', type: 'string', value : '',
   description : 'Build the specified input methods into gtk (comma-separated list or "all" or "none")')
-option('enable-documentation', type: 'boolean', value: 'false',
+option('documentation', type: 'boolean', value: 'false',
   description : 'Build API reference and tools documentation')
-option('enable-man-pages', type: 'boolean', value: 'false',
+option('man-pages', type: 'boolean', value: 'false',
   description : 'Build man pages for installed tools')
 option('introspection', type: 'boolean', value: 'true',
   description : 'Build introspection data (requires gobject-introspection)')
-- 
2.30.2